Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Mar 2012 00:38:25 +0000 (16:38 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Mar 2012 00:38:25 +0000 (16:38 -0800)

Trivial merge